Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 07:56:36 +0000 (23:56 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 07:56:36 +0000 (23:56 -0800)
commitfce584d85b01675d8ec9fd947e7e25f8d876c5b3
tree88e1d5cea402bce650d8af472a9c75a43b61f601
parent67222263283a48b011b24734d79f7fbdde3faaa6
parentf8b9102a789e747ab26ffa7b7d6c8168b762b8da
Merge from trunk.